see rhbz#1122868 for problems, needs a different approach

This reverts commit 1c6bd2c4.

Change-Id: I3aa943c086540a7bcde31ebb03c5be552dd739c6