Revert 894b47b..476bd43

This rolls back to commit 894b47b4587d8d109b7f1a7b9ad1c994046c583b.