Revert "Design 20140529 18:11"

This reverts commit 914bfe3ef08b865c3799d752a8f13e2ec2b9e9f4.