Revert fc22114..22f7a24

This rolls back to commit fc221148c6fb689d1b14fc0548fd03c15de177fa.