Revert d5e28ac..5caef00

This rolls back to commit d5e28ac721c847a52407705793ef240e65b376b9.