Revert 9afcb3e..a172d2d

This rolls back to commit 9afcb3e8f8ae2e50ffc71a610c68c57ad8d3700c.