Revert b2793a5..4cbe539

This rolls back to commit b2793a54166c18f3c9f1183f2361d1cf64e06e3e.