Revert 468ca07..68d4c80

This rolls back to commit 468ca072004fce7bff1209c8380ed97878d708de.