Revert 2f80a38..f332fc1

This rolls back to commit 2f80a38bc9678f39ed360933b2177e531cf4cc58.