Revert 048f34a..9108832

This rolls back to commit 048f34af17b26b069e00448578e557f312a4d7fb.