Revert 6e0243f..5f28569

This rolls back to commit 6e0243ff1522369b8183b8eab562a8fef8c64fcb.