Revert 03d0187..e3dad4c

This rolls back to commit 03d0187d987b5cbaa4af65056fb664298654c217.
30-12-2014 17:12