Revert ec48711..e5c9199

This rolls back to commit ec48711378ea36c0dc31042e08f7c978ec642a5d.