Revert f33471c..55dc11a

This rolls back to commit f33471c7417cba9ac69a0a5319a90dd35f141e96.