Revert 04f9344..23da618

This rolls back to commit 04f9344c17e5c50b8e70a789be85c69b9ae2ab3d.