Revert "Moves and renames plugin function; fix #503"

This reverts commit 0e6f26480ae70ae263b787d8b6940cc18d18d1c6.