Revert "SLP Issue 23"

This reverts commit 109ac24a46dd021e6ab84e085193bc678206f925.