Revert 8987d23..d720354

This rolls back to commit 8987d23eabfce6a6f4982ea02b365ad67689dadf.