Revert f9db10b..4908914

This rolls back to commit f9db10b2f42138bd6426dd8154767fc2896be4ea.
Copied working mashup zip contents