Revert 9dc8d8c..ff1660a

This rolls back to commit 9dc8d8cbe04a2bcad7d943dcf2245ea0420f780d.