Revert 5a38b70..dc784ce

This rolls back to commit 5a38b708e1247caccfa7acd27491d8d947cdf973.