Revert 9990ba5..6834f4e

This rolls back to commit 9990ba5765c6daf00e22ded80f8a36708feab727.
Revert 6834f4e..8414d3e

This rolls back to commit 6834f4e3ee268b7bfc0b9a84a5f46029ecfab550.
Revert "Merge branch 'development-issue-8'"

This reverts commit 6834f4e3ee268b7bfc0b9a84a5f46029ecfab550, reversing
changes made to 9990ba5765c6daf00e22ded80f8a36708feab727.