Revert c9030ec..6410566

This rolls back to commit c9030ec4e5176f2c5fc92ddaab933241a5415cf3.