Revert 9612fae..60fb546

This rolls back to commit 9612faecd629888f07c5705785e129a8a867c1d2.