Revert 90e997d..5f5392a

This rolls back to commit 90e997d5b188c20d1456367031a360da38683865.