Revert ff044c8..7409efe

This rolls back to commit ff044c8e4a9910298949667e69e80684886bc4dc.