Revert d1ec238..a55ceec

This rolls back to commit d1ec23822c995f8b06f2b56345e2c85919d458d2.