Revert 01388ab..d65527e

This rolls back to commit 01388ab954225291b6adb4d0649867e54d621556.