Revert 02c20fd..8ad7c85

This rolls back to commit 02c20fdf95bad80238a7d76f02f437109a6cd9a0.