Revert 9448d4b..f48e8cb

This rolls back to commit 9448d4bd9e905dc9f783608948920fddde468692.