Revert 271e0be..f92cf26

This rolls back to commit 271e0be574479e9bb04cc1afa31051bf71a46dfd.