Revert 4cdb231..523eda7

This rolls back to commit 4cdb2319cbac4ec21e9707d4f35bd67d17fdc95d.