Revert 4a13efa..a00da75

This rolls back to commit 4a13efad9ebe1e9cb873bb13314dcf12c0ec689a.