Revert aeeb1d4..00d8682

This rolls back to commit aeeb1d4aaf910fd7f7e41effd0c093ed05916868.