Revert 98b1f2a..f0486ea

This rolls back to commit 98b1f2af7da0f07001fa0c443e6aff4ea7591442.