Revert 61e2af5..cce04a6

This rolls back to commit 61e2af5144c27052ddad9df9ea43f8e849f4e0a3.