Revert b4aa352..e279765

This rolls back to commit b4aa352b88d7c5cc5463770cb9a19e61b49c192b.