Revert 49fac77..2339cc9

This rolls back to commit 49fac7755131650c6efc59aa339a9466f9b370e6.