Revert 1582cfb..34fee53

This rolls back to commit 1582cfb92a8745dcaebd17fbabc3e3051c3b099a.