Revert dec9751..f846faa

This rolls back to commit dec9751636be7ef036a6644512db265b5f801b02.