Revert 02e45a6..05c3633

This rolls back to commit 02e45a68f9eacf4dc874d4ba5e89959a677ca935.
Some unexpected changes