Revert to update 2014-04-20-15:06 (GPL v3)

This rolls back to commit b9eea7f3b525dace1163efb457fb80dc221405e6.
Revert to update 2014-04-20-15:06 (GPL v3)