Revert 4aafba2..6f9a09e

This rolls back to commit 4aafba239d857185b650b965fe4a79d5a0639a42.