Revert 0ea1515..bdae4c1

This rolls back to commit 0ea151594139d64567e4fefe7b489fdbd25bdb5f.