Revert 309159d..c858d18

This rolls back to commit 309159da619d72ca40f75cd3c4733e89e07e3667.