Revert 4bfd56b..c2721bc

This rolls back to commit 4bfd56bff3caac894e6aca4834641622b56085a5.