Core: Use plain element instead of un-wrapping the element again

Closes #1060