Revert 26c1a80..f1e33a3

This rolls back to commit 26c1a80264695d2fe6aea25bde93b74ab75a0dfe.