Revert bbad297..b2278eb

This rolls back to commit bbad2978485dd18d020280c2b72f1409520675e3.