Revert dd6df15..fc5e632

This rolls back to commit dd6df158b1a9997acea96c3c88b8727213f1250e.