This reverts commit d10871534f. This is a place-holder so I don't forget to revert this when [1] is resolved [1] https://bugzilla.redhat.com/show_bug.cgi?id=1303660 Change-Id: I18c8aa6e7233f74c680d23b573fe9c3817a5779a
d10871534f