Revert 7a53f9b..505b870

This rolls back to commit 7a53f9b77a32751d53ff43aacd1ac5c440bea6ae.