Revert 03c800f..22dd866

This rolls back to commit 03c800f53883fdca9599701800944edf78fa123f.