Revert d411e80..bd94267

This rolls back to commit d411e80c81479919b6c834ed876fcef92cf3fa34.