Revert c017abf..2d799ba

This rolls back to commit c017abfcb49754eaa031f02e41d56eb49cb2fa1d.