Revert 8387d61..ba6e8a9

This rolls back to commit 8387d619df74ec12f8b3462d9c338798e8d49fb5.