[MC-90870] Picking a boat (middle mouse button) always gives an Oak Boat

When I place a boat down (for example an Acacia Boat) and then pick it (middle click on the mouse) it gives me an Oak Boat. Same for all the boats.

Environment

Windows 10
Java V8 Update 51

Affects 15w43a

Affects 15w43b

Please do not mark issues as private, unless your bug report is an exploit or contains information about your username or server.