Revert aae6c94..ded6a43

This rolls back to commit aae6c941e298ba0d22f0f2bd361bf942805e7116.