Revert 5da2033..8aa1172

This rolls back to commit 5da203394dfd844816b31c60c05fad55b88ec0a2.