Revert 07cc80d..5ddb229

This rolls back to commit 07cc80d0c874546adc83c958dc82514b1354cddf.