Revert d47611c..f27deba

This rolls back to commit d47611cb02c97575edc67656e5e34e24cc47820e.