Revert 0496932..02b992a

This rolls back to commit 0496932f6c7254231f4eacc3c919eba59d563623.