Revert c420b37..1be2aa9

This rolls back to commit c420b37eec27d251b82183249c66b90b0f7ab76a.