Revert 53555af..764fae2

This rolls back to commit 53555afdbc875c9a1b48387bc05a90e405c0dea1.