Revert 23ec767..3086cac

This rolls back to commit 23ec767af40ed3138baf77ad06e7bb661e205d2b.
rabu 16-7-2014