Revert 15cc676..f88f754

This rolls back to commit 15cc6761629394826444b262a8c863dd434d0544.