Revert ffce3db..495aba4

This rolls back to commit ffce3db9ac50876067e4add291981a2a181d2f85.