Revert bcf2f8d..0c48acc

This rolls back to commit bcf2f8df44e701c958b89e1f420cc9ad85f8cf21.