#389735. Fixed Unbucket functionality.