Revert df1ce2b..ee0041e

This rolls back to commit df1ce2b25343c5aa45c54e82027f65339c2f3635.