Revert 89fdbc1..0af17be

This rolls back to commit 89fdbc1af5ab5a93ce8393fd9115e185eeb93df4.