Revert 3fc1b1e..4b6de8e

This rolls back to commit 3fc1b1ec786d179563177c812b6b67d4c9a20352.
Merge branch 'dev'