Revert 38fa69d..437348c

This rolls back to commit 38fa69d6fb1830cd66b00aceb2c69f306998f2a3.