Revert 345b2ba..a419939

This rolls back to commit 345b2ba34e712d030cbeb60eb117988bc8dc3d7f.