Revert 763d50e..710e55c

This rolls back to commit 763d50e73f2585e2239a9e9ee75eeca1369937c0.