Revert c1e6ad8..31bf84b

This rolls back to commit c1e6ad8327a2e86dcf6c8d1e09a431f0487740a4.