Revert 86afaa0..ae6fff9

This rolls back to commit 86afaa001e870266ae0c1dff23be4a3fa0507827.