Revert bf0c5a5..fb02e20

This rolls back to commit bf0c5a5e87fd93d6be81e6e64a36b59debae72f4.