Revert 66ce06d..685a7e0

This rolls back to commit 66ce06d231b5a23e886ee95a7e38194ed6c8b1ad.