Revert 1090f25..4ddeac5

This rolls back to commit 1090f25db83f42bab0584edf1ca5fed52ab633f2.