This reverts commit f18d8469. Tests are red on the bot. Blacklisting until this is investigated further. Change-Id: Ibb9b4066abe28e8625c4eed5e0818e6a3fdd4f44