Revert f856e6c..082954e

This rolls back to commit f856e6c30684613fa5945c411bc50c16a038dee3.