Revert 2cdf0e3..48ba81e

This rolls back to commit 2cdf0e36870888ae7b8149397297628df8f47fb3.