Revert dbeff77..7a46a74

This rolls back to commit dbeff77a7d2143ec7fbb7307b5d686bae7fcae64.