Revert 302409d..bab7187

This rolls back to commit 302409df80a930f6cff8384ae1b572a9c281554b.
12-11-2014 14:24

good version