Revert 7a99796..013f4a2

This rolls back to commit 7a99796bd6c64a3366371e291a86229430bf12e5.