Revert 4fa8109..086ea87

This rolls back to commit 4fa8109ce15b7c41549738d89a585ca2639864c1.