Revert 8eaf563..194c0c5

This rolls back to commit 8eaf563a0fc34e30040c3009abe42ee27feef32f.