Revert 636ec88..021270c

This rolls back to commit 636ec88754643996bf43aaff7a4b0565fadddb24.