Revert 7672d9c..1caf6d2

This rolls back to commit 7672d9c4dc36129adc124b9c4e346b648533ea39.