Revert fe7cd1d..a8715fa

This rolls back to commit fe7cd1d99185fa4f650bda24b63ec99940ab1e75.