Revert 61f9585..525a6f7

This rolls back to commit 61f9585478fca5c9d5af77d2009406e2cfc8d2a8.