Revert 9c54002..59ac534

This rolls back to commit 9c5400217bf280643ddf7da7af6a320d46d7e536.