Revert 5b99bfa..b57fd19

This rolls back to commit 5b99bfab154aa3dfae956af87d0a022d9592b8cd.