Revert cd133b9..099907e

This rolls back to commit cd133b96ec0bd6cf7078e3df60304949795bf1f0.