Revert 2038c6b..5629531

This rolls back to commit 2038c6b665df9d1dac87b6ce03d614c3acf0c695.