Revert 4879f0c..69da778

This rolls back to commit 4879f0c07b66fc948e0be2b665fe9e4a677620ad.