Revert fc717dd..a1f5735

This rolls back to commit fc717dd8eb4c03cebd52f7209a184c8a86db0d50.