Revert d766930..e211f39

This rolls back to commit d766930cc62c6da094ec072700dd3b522a7aaf70.