Revert 3f4b2db..d714caf

This rolls back to commit 3f4b2db5c2af5f004dbda8b2150c1264328a7cf0.