Revert 5013ec7..fa46aba

This rolls back to commit 5013ec7c0d66c4eb73f852ccd31863be5aaded51.
v17

IT WORKS!!!