Revert a0e3346..2dceb57

This rolls back to commit a0e33461a0cd92d916bbcdbfcdee4574411aee93.