Revert f576c12..261af7d

This rolls back to commit f576c1289c2fe78cebaafd12f22cc26edcd23f3e.