Revert 8d746c2..a81e3ef

This rolls back to commit 8d746c25377431a4ea72300eb06a5d69399c4f68.
DEV ENVIRONMENT