Revert 6bd4692..61adf0f

This rolls back to commit 6bd469276f203d759ee3eb4ecb6ebf79683a6d77.