Revert 449ffab..b78082a

This rolls back to commit 449ffab2ccbc468f77254cb1a7824e73b68bf641.