Revert 217b354..7418288

This rolls back to commit 217b35471e8d88f20f02304ed37c4b4f4848a8c6.
This reverts commit dfe94b78225f3b2d9b607ebdd360c673bee3378a.