Revert 2d16ad3..8e82a2f

This rolls back to commit 2d16ad3a8c795f9cd144a9a9ae98e3283ca1695b.