Revert 09f3fd3..0cddfc9

This rolls back to commit 09f3fd3c2a13f5c3db08f56a10e177db35cfa91c.