Revert 0a9ea29..3d59009

This rolls back to commit 0a9ea2953d0eb55a53e8843cbf482a9229920123.