Revert 0d42ee3..ea4b4ae

This rolls back to commit 0d42ee3b4cd41bbe438a9c3dff6a4d0434dbe039.