Revert 4e622cc..171d2ec

This rolls back to commit 4e622cca1217317cad0503f592ba5a50db9cafaa.