Revert 53b3d38..1255e19

This rolls back to commit 53b3d389c7ccdc83348d09046a981c32818da1b4.