Revert "inline gone for now"

This reverts commit ab987f761ba1416bde990b54ddd71d9d6a0a8416.

Conflicts:

	default.xml