Revert 4e5c3c2..5e465b6

This rolls back to commit 4e5c3c23e00e7280c7dbc93079c120cf7be5affc.
Fixing missing files problem