Revert 176dc20..4175971

This rolls back to commit 176dc2065b8b3c031f416233d56645e57d81a039.