Revert c4a63a1..5f52d5e

This rolls back to commit c4a63a1a03958a48a36f24e9b3c001d4dd5252cf.