Revert 614240c..0a9c98f

This rolls back to commit 614240cc1ef1838034c92aa78611383b115452e1.