Revert 1b90667..79e1609

This rolls back to commit 1b90667d1597905091d50049b925d02c692d7a9d.