Revert 33dc801..dfd0d79

This rolls back to commit 33dc80117f48534f66aea87f1157c7a45fac5199.