Bug 889284 - Use building blocks drawer