Revert fa8e447..d256874

This rolls back to commit fa8e44752ba1d268e2e0780ca01160b758c795d2.