Revert baa388e..4bbe4c0

This rolls back to commit baa388e492198f9d15c140f61af2e0bc42a4e7a7.