Revert d2477a2..d48db00

This rolls back to commit d2477a29ca0060499879a85b670bd62018f189a4.