Revert 7d50e3c..2d63b9b

This rolls back to commit 7d50e3c01d02ded3287478f7d0abe6a3c69bba09.