Revert 2f7ceb0..2b3898b

This rolls back to commit 2f7ceb03c044ef9ff0224e26d1cb387eeeceb93e.