Revert c0adf95..1768e0b

This rolls back to commit c0adf95eba7861437a62a32f8c61eb5a5343e911.