Revert 2485352..f016950

This rolls back to commit 2485352e527231a5e5602441dbf368d1ef82f678.