Revert c6d4119..a51a7d1

This rolls back to commit c6d4119ee7659b8d9b6dba55503dd8a67c102c84.