Revert ff2684a..4468176

This rolls back to commit ff2684a5c557d476005dc39b842a3991d4fe7da9.