Removed drainer that mysteriously disappeared in merge... wtf.