Revert fda215c..ecc9ba3

This rolls back to commit fda215cb7c6fd4bc4aa64a2f99dcba75fde339ef.