Revert 2399820..f23d1b3

This rolls back to commit 23998203ec1a7f9bc8256d52fb213128ef4cd647.