Revert 604e04a..9d7b270

This rolls back to commit 604e04aeb1ca52a1041bcc124c2ec5517477de77.